Auto merge of #2204 - alexcrichton:bump, r=brson
authorbors <bors@rust-lang.org>
Thu, 10 Dec 2015 15:29:43 +0000 (15:29 +0000)
committerbors <bors@rust-lang.org>
Thu, 10 Dec 2015 15:29:43 +0000 (15:29 +0000)
r? @brson


Trivial merge